From: jave <joakim@verona.se>
Date: Fri, 2 Jan 2015 15:30:55 +0000 (+0100)
Subject: merge master
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~3423
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=db4613576d3115aa320f0293d081ce98baa06acd;p=emacs.git

merge master
---

db4613576d3115aa320f0293d081ce98baa06acd